widget-factory: use new icon instead of gtk logo

diff --git a/demos/widget-factory/Makefile.am b/demos/widget-factory/Makefile.am
index 742c17723ee989957053081d3e270c9600227e0c..97722044295a1293d053e2d08931c26af913c8a8 100644 (file)
--- a/demos/widget-factory/Makefile.am
+++ b/demos/widget-factory/Makefile.am
@@ -60,7 +60,6 @@ uninstall-update-icon-cache:
 
 EXTRA_DIST += \
        widget-factory.ui \
-       widget-factory.gresource.xml \
-       gtk-logo-256.png
+       widget-factory.gresource.xml
 
 -include $(top_srcdir)/git.mk

diff --git a/demos/widget-factory/gtk-logo-256.png b/demos/widget-factory/gtk-logo-256.png
deleted file mode 100644 (file)
index f488e45..0000000
Binary files a/demos/widget-factory/gtk-logo-256.png and /dev/null differ

diff --git a/demos/widget-factory/widget-factory.c b/demos/widget-factory/widget-factory.c
index ef3f1d403faa1cbb6b759cdd6074ee63c4368335..df301e732aac216320ae79c9ad5c6340c0645e14 100644 (file)
--- a/demos/widget-factory/widget-factory.c
+++ b/demos/widget-factory/widget-factory.c
@@ -56,15 +56,12 @@ activate_about (GSimpleAction *action,
                 gpointer       user_data)
 {
   GtkWidget *window = user_data;
-  GdkPixbuf *pixbuf;
   const gchar *authors[] = {
     "Andrea Cimitan",
     "Cosimo Cecchi",
     NULL
   };
 
-  pixbuf = gdk_pixbuf_new_from_resource ("/logos/gtk-logo-256.png", NULL);
-
   gtk_show_about_dialog (GTK_WINDOW (window),
                          "program-name", "GTK+ Widget Factory",
                          "version", g_strdup_printf ("%s,\nRunning against GTK+ %d.%d.%d",
@@ -77,11 +74,9 @@ activate_about (GSimpleAction *action,
                          "website", "http://www.gtk.org",
                          "comments", "Program to demonstrate GTK+ themes and widgets",
                          "authors", authors,
-                         "logo", pixbuf,
+                         "logo-icon-name", "gtk3-widget-factory",
                          "title", "About GTK+ Widget Factory",
                          NULL);
-
-  g_object_unref (pixbuf);
 }
 
 static void

diff --git a/demos/widget-factory/widget-factory.gresource.xml b/demos/widget-factory/widget-factory.gresource.xml
index 79bad5ba25c1c8c369942096f8faf6a656be0346..ec660fff8181bdd3a23f36c21add97475368d596 100644 (file)
--- a/demos/widget-factory/widget-factory.gresource.xml
+++ b/demos/widget-factory/widget-factory.gresource.xml
@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <gresources>
-  <gresource prefix="/logos">
-    <file>gtk-logo-256.png</file>
-  </gresource>
   <gresource prefix="/ui">
     <file preprocess="xml-stripblanks">widget-factory.ui</file>
   </gresource>

diff --git a/demos/widget-factory/widget-factory.ui b/demos/widget-factory/widget-factory.ui
index d1242c05f8ca726735bfcca75aa7305881f1ea28..b4b6d2854b47634319d99fff233b19e579742f5c 100644 (file)
--- a/demos/widget-factory/widget-factory.ui
+++ b/demos/widget-factory/widget-factory.ui
@@ -1883,7 +1883,7 @@ Suspendisse feugiat quam quis dolor accumsan cursus. </property>
                             <child>
                               <object class="GtkImage" id="imageo">
                                 <property name="visible">True</property>
-                                <property name="resource">/logos/gtk-logo-256.png</property>
+                                <property name="icon-name">gtk3-widget-factory</property>
                               </object>
                               <packing>
                                 <property name="name">page2</property>